Justin Clark-Casey (justincc)
0a1d61950b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-12 19:03:26 +00:00
Diva Canto
cadd645076
Renamed one var and deleted commented code. No functional changes.
2012-01-12 10:22:52 -08:00
Justin Clark-Casey (justincc)
b47c0d7e51
refactor: Move existing npc owner checks to NPCModule.CheckPermissions() methods and expose on interface for external calls.
2012-01-12 18:14:19 +00:00
Diva Canto
8bdd80abfa
HG: normalize all externalized user ULRs to be the Home URL, i.e. the location of the user's UAS. This corrects an earlier design which had some cases pointing to the profile server. WARNING: CONFIGURATION CHANGES in both the sims (*Common.ini) and the Robust configs (Robust.HG.ini). Please check diff of the example files, but basically all vars that were pointing to profile should point to the UAS instead and should be called HomeURI.
2012-01-12 09:56:35 -08:00
Melanie
4492bc1bcd
Merge branch 'master' into careminster
2012-01-12 17:52:29 +00:00
Bo Iwu
6214e6a217
Allow update of stored entries within User Management Module-this is needed for proper work of HG friends.
...
See http://opensimulator.org/mantis/view.php?id=5847
2012-01-12 17:51:13 +00:00
Michelle Argus
34137ed4ea
Correcting ini.example were permissionmodules uses komma instead of space as separator
2012-01-12 12:27:41 -05:00
Melanie
5d9e135b5c
Remove ViewObjectInventory method unsupported by core
2012-01-12 01:11:05 +01:00
Melanie
1a3a1e6665
Adapt a cast to using the new TeleportFlags
2012-01-11 19:00:17 +01:00
Justin Clark-Casey (justincc)
38db874755
If deserializing a scene object fails during IAR load then ignore the object rather than halting the IAR load with an exception.
2012-01-11 14:33:26 +00:00
Mic Bowman
5f7e392c7c
Add a check to see if an asset exists before recreating it while
...
loading an archive. This does add an extra roundtrip to the asset
server if loading new assets but it protects against overwriting
(and potentially corrupting) existing assets.
2012-01-10 16:26:01 -08:00
Justin Clark-Casey (justincc)
53fb20880c
minor: Fix wrong column length in image queues report
2012-01-10 22:02:35 +00:00
Justin Clark-Casey (justincc)
5002f06d24
rename "show image queue" to "show image queues" in line with other udp info commands.
...
Eliminate redundant one line methods
2012-01-10 21:36:35 +00:00
Justin Clark-Casey (justincc)
ef074deb52
Add "show image queue <first-name> <last-name>" region console command
...
This is so that we can inspect the image download queue (texture download via udp) for debugging purposes.
2012-01-10 21:30:12 +00:00
Melanie
8fa1108b72
Merge branch 'master' into careminster
2012-01-10 21:28:59 +00:00
Melanie
a4c2e7f599
Merge branch 'master' into careminster
2012-01-10 20:34:43 +00:00
BlueWall
a2fe3e2081
Remove DEBUG option
...
Remove DEBUG option from OpenSim.ini.example as it is handled in the console now with "debug teleport"
2012-01-10 15:29:08 -05:00
Diva Canto
ce44f56af9
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-10 11:11:08 -08:00
Diva Canto
7b84942f86
HG landing points: this hopefully fixes some confusion that was making HG avies always land in 0,0
2012-01-10 11:10:47 -08:00
Justin Clark-Casey (justincc)
18497cef73
Add avatar names to appearance log messages
2012-01-10 18:54:20 +00:00
Justin Clark-Casey (justincc)
a3bb1a81de
correct very minor typo in "debug scene" help
2012-01-10 18:47:30 +00:00
BlueWall
66783398d0
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-10 13:43:42 -05:00
Justin Clark-Casey (justincc)
d67e9916b8
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-10 18:42:37 +00:00
BlueWall
3deb52d399
Teleport Debugging
...
Move setting from ini to existing facitilies - thanks justincc
toggle with console command: debug teleport
2012-01-10 13:41:35 -05:00
Justin Clark-Casey (justincc)
d67e8291c8
Add "app find <uuid-or-start-of-uuid>" command to find the appearance using a particular baked texture, if any.
...
This is for debugging to relate texture console entries back to particular users on the simulator end.
2012-01-10 18:41:07 +00:00
Melanie
1cc685e820
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2012-01-10 18:33:32 +00:00
Diva Canto
a22d0dcab9
HG Friends: fixed bug introduced by 571efeddb2
(r/17672)
2012-01-10 09:58:53 -08:00
BlueWall
707c8c6f2b
Add some run-time debugging support
...
Add configuration option - DEBUG to enable debugging methods. This is temporary for helping users testing teleport routing be able to report back the data with the test cases. We can remove when finished with this, or leave it if it proves to be useful.
Users: set DEBUG = true in OpenSim.ini to get more information from teleport routing. The default is false. It presently prints the TeleportFlags value.
2012-01-09 18:19:55 -05:00
BlueWall
b3a12167d6
Use our TeleportFlags
...
Switch to our TeleportFlags enum instead of LibOMV because we need to define a type for HG Logins. Also moved some debugging in ScenePresence into a function to make it simpler to enable/disable.
2012-01-09 17:54:35 -05:00
BlueWall
95345521f0
TP Routing debug
...
Fix test to checking against bitfield instead of int
2012-01-09 17:04:34 -05:00
BlueWall
3640afdd95
Fix teleport routing for incoming HG+Owner
...
Incoming HG owner/estate manager, etc. is routed according to the rules defined for teleports within the local grid. Left some commented debugging code inside so we can test other cases. Will remove when tings are settled in.
2012-01-09 14:31:22 -05:00
Melanie
bc08cc201b
Merge branch 'master' into careminster
2012-01-09 19:22:06 +00:00
BlueWall
43145c7f67
Debugging HG teleport routing
...
Add some temporary debugging to the teleport routing to get a better view of what happens when HG jumps are made.
2012-01-09 13:07:02 -05:00
Melanie
520b8b342e
Merge branch 'master' into careminster
2012-01-09 06:52:46 +00:00
BlueWall
34c42cdab0
Fix HG teleport routing
...
Needed to breakout the ViaHGLogin check to it's own section. For some reason it would not factor in when combined with the other teleport flag types.
2012-01-09 01:37:28 -05:00
Melanie
0e855fea7c
Fix a build break
2012-01-09 01:05:19 +00:00
Melanie
1ebd79e413
Add the HG case to landing point checks
2012-01-09 00:54:59 +00:00
Melanie
0cf59534ff
Update teleport routing to match Avination
2012-01-08 23:39:23 +00:00
Melanie
d5c5bbe0a1
Update teleport routing to match Avination
2012-01-08 23:38:43 +00:00
Melanie
44cde8d5c6
Update teleport routing to match Avination
2012-01-08 23:36:49 +00:00
BlueWall
37fc19fae0
Update building instructions
...
a good place to trigger a test on the opensimulator site
2012-01-08 18:21:09 -05:00
BlueWall
fb16d49511
Merge branch 'master' of /home/opensim/src/opensim
2012-01-08 17:56:03 -05:00
BlueWall
266167f5a3
Fix teleport routing
...
Route non-owner avatars according to land settings
2012-01-08 17:41:47 -05:00
Melanie
4bf2e19898
Merge branch 'master' into careminster
2012-01-07 18:11:21 +00:00
Melanie
32eb7ddc37
Fix threat level setting on osNpcPlayAnimation
2012-01-07 18:09:53 +00:00
Melanie
6f19e231b6
Don't try to save a NPCs attachment states on NPC delete
2012-01-07 18:09:45 +00:00
Melanie
94fa6cb071
Fix threat level setting on osNpcPlayAnimation
2012-01-07 12:29:59 +01:00
Melanie
efe51fd5cb
Don't try to save a NPCs attachment states on NPC delete
2012-01-07 12:06:21 +01:00
Melanie
69c0f252a4
Force the group tag of NPCs to "- NPC -" unless the name is completely blank.
2012-01-07 12:05:42 +01:00
nebadon
58cb7cd084
fix a typo "osNpcCreated" to "osNpcCreate" in OSSL threat level check
2012-01-06 23:07:48 -07:00