7bd48d383d
Resolved merge
2010-03-12 13:48:31 -05:00
8b1e33eb2d
Fixed SimianGrid.ini to use GridCommon.ini(.example)
2010-03-12 10:31:43 -08:00
3fa4988810
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-03-12 10:19:57 -08:00
ed3288a8db
Bug fix: "last location" login.
2010-03-12 10:16:21 -08:00
db61d66e74
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-03-12 17:58:25 +00:00
f6f6ef1532
Dynamics Integration Part 1
2010-03-11 19:12:38 -05:00
2313d14acb
minor: add some more documentation for IHttpServer.AddHTTPHandler() to tell the caller that the best match for an incoming request URI is invoked
2010-03-11 23:33:55 +00:00
e844524b41
Upgrade Newtonsoft.Json.dll from 1.3 to 3.5r6
...
Actually using the one built against Net 2.0 (labelled Newtonsoft.Json.Net20.dll) since the 3.5 build is not compatible with Mono 2.4 (though it is with Mono 2.6)
2010-03-11 21:04:56 +00:00
a578feefba
very minor spacing adjustment
2010-03-11 20:20:38 +00:00
2040649871
Adding the SimianGrid connectors
2010-03-11 11:19:02 -08:00
265c24ec33
Changed some properties and methods from private to protected in LLLoginResponse and LLLoginService so they could be inherited better.
2010-03-11 07:56:44 -08:00
b18ca2fee6
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-03-10 14:06:12 -08:00
2af97b46ec
* Cleaned up and commented the messy SendInventoryUpdate, fixed a broken debug line, and commented the debug line out since it can quickly become noisy
2010-03-10 14:05:49 -08:00
04a6b1caf8
Reintroduce a check that was dropped from permissions
2010-03-10 05:31:34 +00:00
f58a0394ed
Formatting cleanup. Add copyright notices.
2010-03-10 13:15:36 +09:00
c5bb51b443
Changed a cryptic debug message and a wrong comment
2010-03-09 17:33:31 -08:00
dbb2edf1a6
Fixed caching of user accounts.
2010-03-09 17:09:44 -08:00
689514a40a
Cache UserLevel in ScenePresence on SP creation. Change IsAdministrator
...
to use that stored value.
2010-03-09 23:12:10 +00:00
88771aeed3
Cache UserLevel in ScenePresence on SP creation. Change IsAdministrator
...
to use that stored value.
2010-03-09 23:11:28 +00:00
40873504dc
Merge branch 'master' into careminster-presence-refactor
2010-03-09 22:46:17 +00:00
c7590bfd50
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-03-09 22:44:14 +00:00
98f91a252c
- parcel blocking, region crossing blocking, teleport blocking
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-03-09 22:43:55 +00:00
fce9e499e4
- parcel blocking, region crossing blocking, teleport blocking
2010-03-09 22:38:58 +00:00
80b5a95bb8
Revert "Adds Land Banning."
...
This reverts commit a87d7a1296
2010-03-09 22:29:02 +00:00
06e351f1ef
Revert "Adds land ejection and freezing. Adds more checks to land banning."
...
This reverts commit 44d523518a
2010-03-09 22:28:52 +00:00
4b8af2e1aa
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-03-09 12:19:11 -08:00
01218093a6
* Typo fixes
...
* Performance improvement in the expensive GenerateClientFlags()
2010-03-09 12:06:53 -08:00
4423630f1e
remove milliseconds from console log again
2010-03-09 18:56:32 +00:00
5caae0293a
Fix bug where approximately half the time, attachments would rez only their root prim until right clicked (or otherwise updated).
...
The root cause of this problem was that multiple ObjectUpdates were being sent on attachment which differed enough to confuse the client.
Sometimes these would eliminate each other and sometimes not, depending on whether the scheduler looked at the queued updates.
The solution here is to only schedule the ObjectUpdate once the attachment code has done all it needs to do.
Backport from head.
2010-03-09 18:53:04 +00:00
c135235000
MSSQL tweaks for latest ROBUST - friends handling fixed, GridUserData placeholder added.
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-03-09 18:37:08 +00:00
9ea6509a1c
Comment a debug message that is a tad too spammy
2010-03-08 21:08:48 +00:00
2362da2ad0
Add config option for switching between CSJ2K and BuggyJPEG.
2010-03-08 20:29:26 +00:00
fa38cf3ee8
* Added code to support either CSJ2K or OpenJPEG texture decoding. Currently hardcoded to CSJ2K (so no functional change) but this could easily be switched to a config option
2010-03-07 17:03:56 -08:00
d71ed7081b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-03-07 16:05:12 -08:00
3ecccbb77d
* Updated to libomv r3268 which fixes the mapping for OpenJPEG on 64-bit systems and adds protocol support for Viewer 2.0 (still needs work in OpenSim to get things fully functional)
2010-03-07 16:03:15 -08:00
6367bdc696
Bug fix: correct name of methods in user accounts connector.
2010-03-07 11:35:25 -08:00
26673af974
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-03-07 10:01:43 -08:00
38b8c52762
Removed obsolete configs.
2010-03-07 10:01:23 -08:00
49baf090cd
Small consistency change
2010-03-07 16:08:00 +00:00
c8c608acc8
Small consistency change
2010-03-07 16:07:40 +00:00
3d053b194a
Small consistency change
2010-03-07 16:06:52 +00:00
89a739b45f
Small consistency change
2010-03-07 16:05:24 +00:00
2e5f7ec926
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-03-06 20:05:33 +00:00
2dcf73dd93
- supporting llTextBox
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-03-06 20:05:11 +00:00
f4c165afe7
Bug fix: store correct position information upon logout. Fixes mantis #4608
2010-03-06 08:21:54 -08:00
8180c72cbc
Merge branch 'master' into careminster-presence-refactor
2010-03-06 12:37:24 +00:00
2fdd535302
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2010-03-06 12:24:26 +00:00
1f7a0cf892
Merge branch '0.6.9-post-fixes' into careminster
2010-03-06 12:24:09 +00:00
83929c69e3
- implementing server 1.38 functions
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-03-06 11:59:16 +00:00
9fa9cfd215
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-03-06 11:58:19 +00:00
Kitto Flora