 Melanie
|
7a0d7be44c
Refix the fixed fix!
|
12 years ago |
 Diva Canto
|
f7c61790b7
Fixed borkness with previous merge.
|
12 years ago |
|
Diva Canto
|
841b4232f6
Line endings
|
12 years ago |
|
Diva Canto
|
3fa51f66ec
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
|
12 years ago |
|
Diva Canto
|
d08ad6459a
HG Friends: allow the establishment of HG friendships without requiring co-presence in the same sim. Using avatar picker, users can now search for names such as "[email protected]:9000", find them, and request friendship. Friendship requests are stored if target user is offline. TESTED ON STANDALONE ONLY.
|
12 years ago |
|
Melanie
|
35c3124c3b
Merge branch 'master' into careminster
|
12 years ago |
 Justin Clark-Casey (justincc)
|
30b2a8c778
Move frame loop entirely within Scene.Update() for better future performance analysis and stat accuracy.
|
12 years ago |
|
Melanie
|
c7e302864a
Merge branch 'master' into careminster
|
12 years ago |
|
Justin Clark-Casey (justincc)
|
6e8f80f1ab
Improve threadpool reporting to "show threads" console command (also gets printed out periodically)
|
12 years ago |
|
Justin Clark-Casey (justincc)
|
421b562a04
Add process working memory to "show stats" memory statistics.
|
12 years ago |
|
Melanie
|
03e7bc1526
Merge branch 'master' into careminster
|
12 years ago |
|
Justin Clark-Casey (justincc)
|
68a4ef5ef6
Add 64 bit Windows sqlite3.dll and use this if running a 64-bit windows process.
|
12 years ago |
|
Melanie
|
985526b662
Merge branch 'master' into careminster
|
12 years ago |
|
Justin Clark-Casey (justincc)
|
b817c337dc
On Windows automatically load the correct native ODE library depending on whether the process is 32-bit or 64-bit
|
12 years ago |
|
Melanie
|
acfe7e555e
Merge branch 'master' into careminster
|
12 years ago |
|
Justin Clark-Casey (justincc)
|
d80422eba7
Add line numbers to Util.PrintCallStack()
|
12 years ago |
|
Melanie
|
d913303875
Merge branch 'master' into bigmerge
|
13 years ago |
|
Justin Clark-Casey (justincc)
|
bc13855e64
Reactivate BasicCircuitTests.TestAddClient()
|
13 years ago |
|
Melanie
|
02f0aa592d
Merge commit 'ffdf59a57c936189e3b161b79b4a76a3a9b260bb' into bigmerge
|
13 years ago |
|
Justin Clark-Casey (justincc)
|
ffdf59a57c
Get UUIDGatherer to scan notecards in the graph for asset uuids.
|
13 years ago |
 Tom
|
5484c9b585
Bring us up to date.
|
13 years ago |
|
Justin Clark-Casey (justincc)
|
306af9934a
In an object return message, send a null-terminated empty string in binary bucket to prevent a viewer 3 crash.
|
13 years ago |
|
Tom
|
66dec3b874
Resolve merge commits, stage 1
|
13 years ago |
|
Justin Clark-Casey (justincc)
|
3aa86d22d1
If a FireAndForget thread terminates with an exception, then catch and log rather than letting it terminate the simulator.
|
13 years ago |
|
Justin Clark-Casey (justincc)
|
57e54d84d6
Add new FireAndForgetMethod.None.
|
13 years ago |
|
Justin Clark-Casey (justincc)
|
9a5e0ede7c
For all Util.FireAndForget invocations, set thread to en_US before continuing wtih the invocation.
|
13 years ago |
 root
|
c920ff9d1d
Merge branch 'master' into careminster-presence-refactor
|
13 years ago |
|
Justin Clark-Casey (justincc)
|
c3d82bdcb1
When loading library asset set, only store an asset if it's different from an existing one with the same id.
|
13 years ago |
|
Justin Clark-Casey (justincc)
|
b18ef976ff
Fix interpretation of physics mesh proxies from mesh data
|
13 years ago |
|
Melanie
|
326c46ba70
Merge branch 'master' into careminster-presence-refactor
|
13 years ago |
