Dan Lake
488fe0ae9c
Removed unused events in SceneGraph: OnObjectCreate, OnObjectRemove, OnObjectDuplicate
2012-01-24 13:41:26 -08:00
Justin Clark-Casey (justincc)
7e76397a26
minor: correct text and usage for "image queues show" reigon console command.
2012-01-24 20:54:35 +00:00
Justin Clark-Casey (justincc)
a704d444f2
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-24 20:36:16 +00:00
Justin Clark-Casey (justincc)
8b035dc3c7
Restrict accessible of ODECharacter Shell and Body. Add method doc and some error log lines.
2012-01-24 18:46:24 +00:00
Melanie
855d3a3ba5
Teleport routing, part 1
2012-01-24 04:06:37 +00:00
Melanie
a4977bbe19
Simplify and streamline telehub editing code. Verify rotations and fix
...
spwan point positioning on rotated telehubs.
2012-01-24 02:36:35 +00:00
Melanie
f10288ceae
Add handling bans properly
2012-01-24 03:14:00 +01:00
Melanie
0369d21917
Add teleport routing, first part
2012-01-24 03:13:44 +01:00
Melanie
0d2e02efb1
Reverse the spawn point distance vector
2012-01-24 01:30:41 +00:00
Melanie
c0e1784e86
Correct a coordinate to make the viewer like it
2012-01-24 01:18:13 +00:00
Melanie
cc02f78d4e
Simplify and streamline telehub editing code. Verify rotations and fix
...
spwan point positioning on rotated telehubs.
2012-01-24 01:48:38 +01:00
Melanie
696fbdfa24
Reverse the spawn point distance vector
2012-01-24 01:29:50 +00:00
Melanie
090bf7acca
Correct a coordinate to make the viewer like it
2012-01-24 01:17:41 +00:00
Melanie
8fcb9bf418
Correct some SQL syntax
2012-01-24 00:57:52 +00:00
Melanie
7a87be5015
Fix merge artefacts and build break
2012-01-24 00:45:17 +00:00
Melanie
7bb01a17ee
Add a forgotten parameter
2012-01-24 00:38:00 +00:00
Melanie
07ad821157
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Framework/RegionSettings.cs
2012-01-24 00:36:42 +00:00
Melanie
87799c1f3d
Change Telehubs to store only the data that is really needed and not
...
additional redundant information.
2012-01-24 00:32:10 +00:00
Melanie
c36c916342
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-01-23 21:25:59 +00:00
Melanie
48379e6442
IMPORTANT!!!!! Please READ. DO NOT Use this version or any before it since the
...
Telehub commits! They will eat your babies and corrupt your database while
they munch. DO NOT use anything from the first Telehub commit to this one.
FIRST GOOD COMMIT is the one FOLLOWING this one. You have been warned.
2012-01-23 21:23:55 +00:00
BlueWall
8db64dc77f
Merge branch 'master' of /home/opensim/var/repo/opensim into telehub
2012-01-23 14:54:43 -05:00
BlueWall
6a85abbd14
Add update to Telehub position and rotation before adding SpawnPoints
2012-01-23 14:53:25 -05:00
BlueWall
c1f6478a37
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-23 11:10:56 -05:00
BlueWall
9cfc43005d
Cleanup
2012-01-23 10:28:18 -05:00
BlueWall
39c9b656c8
Cleanup unused parts, add some error handling
2012-01-23 09:42:15 -05:00
Melanie
22ae9331bb
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2012-01-23 13:51:20 +01:00
Melanie
4e0bb49394
Fix llLookAt the right way
2012-01-23 13:48:16 +01:00
Melanie
cd2bf64b87
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
2012-01-23 00:24:31 +00:00
Melanie
7c404375c7
Fix up some parameter naming
2012-01-22 23:20:10 +00:00
BlueWall
74c1ed77a4
Finish connecting Telehub to database
2012-01-22 14:51:15 -05:00
BlueWall
1cd26ba85e
Hooking up new telehub data to the database
2012-01-22 11:46:16 -05:00
Melanie
02572ab1d3
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/RegionSettings.cs
2012-01-22 16:35:14 +00:00
Melanie
24b20f6e4b
Change the key name I missed in last commit
2012-01-22 15:35:14 +00:00
Melanie
68365c20c0
Move Telehub tables and data from EstateSettings to RegionSettings.
...
This is damage control es EstateSettings is not the place this can be put.
EstateSettings is nt unique to a region and therefore would introduce
a hard limit of one telehub per estate, completely shutting off the
option of having SL style telehubs, e.g. one per region. Whole
estate teleport routing can still be implemented id desiresd, this
way all options are open while the other way most options get closed
off.
2012-01-22 11:36:04 +00:00
BlueWall
32d58d6e3e
Telehub Support:
...
Telehub settings now persist to the database and are saved across sim restarts. So-far this only works on MySQL. this is a work in progress, teleport routing is not yet implemented.
2012-01-21 23:26:27 -05:00
Melanie
ba3b0c69f1
Merge branch 'master' into careminster
2012-01-21 19:52:33 +00:00
BlueWall
590f707c42
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-20 23:54:29 -05:00
BlueWall
b6f3de5028
Telehub Support:
...
Support for viewer side of telehub management. Can manupulate Telehubs and SpawnPoints from the viewer estate managemnt tools. This is a work in progress and does not yet persist or affect teleport routing.
2012-01-20 23:50:37 -05:00
Justin Clark-Casey (justincc)
ea72428c9d
Allow a viewer UDP image request retry to trigger another asset fetch if an existing fetch hasn't responded before a timeout.
...
This is to stop a high priority image/texture request from blocking the entire download queue if its asset fetch got dropped for some reason.
2012-01-19 23:09:16 +00:00
Justin Clark-Casey (justincc)
d38e2c0c91
Add image not in database test for LLImageManager
2012-01-19 21:57:12 +00:00
Justin Clark-Casey (justincc)
503faaea62
refactor: separate out common parts of LLImageManagerTests
2012-01-19 21:23:40 +00:00
Justin Clark-Casey (justincc)
381f74276b
Add LLImageManager regression test for discard case
2012-01-19 21:14:09 +00:00
Justin Clark-Casey (justincc)
c92a9a6640
Add "image queues clear <first-name> <last-name>" console command
...
This allows a way to manually clear pending image queue requests for debug purposes
2012-01-19 19:49:06 +00:00
Justin Clark-Casey (justincc)
d75899f2d1
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-19 19:47:18 +00:00
BlueWall
8f871cca10
Add osGetGridHomeURI function
...
Add osGetHomeURI function to the family of osGetGrid* functions. Returns the SRV_HomeURI setting from the [LoginService] configuration.
2012-01-19 14:21:12 -05:00
Justin Clark-Casey (justincc)
9356963bd3
Add basic request and send image regression tests for LLImageManager
2012-01-19 19:00:11 +00:00
BlueWall
edb2e4c5b3
Change URI to lowercase to match existing
2012-01-19 13:55:53 -05:00
BlueWall
bf9ce4709f
Add fetching of SRV_HomeURI to "/json_grid_info"
...
Make SRV_HomeURI available on the GridInfoService through the "/json_grid_info" URI. This i s mainly to service OSSL, but can be seen externally via the URI.
2012-01-19 13:48:31 -05:00
Dan Lake
e41f23dead
Trigger event when prims are scheduled for an update. This gives modules early access to changed parameters.
2012-01-19 03:06:35 -08:00
Dan Lake
5ced49aaa8
Cleaned up Color and Text parameters in SOP and made LocalFlags public for module access.
2012-01-19 03:03:22 -08:00
Dan Lake
2c6272d11a
Add a version of GetGroupByPrim to Scene which accepts UUID instead of localID
2012-01-19 03:01:37 -08:00
Dan Lake
f8079bcd72
Fixed bugs in earlier commit on custom user parameters in Regions.ini
2012-01-19 02:52:05 -08:00
BlueWall
eea726d74e
RegionReady:
...
Back out some of the oar monitoring for the time being. Need to find a better way to get feedback. Will re-visit this soon.
2012-01-18 20:30:57 -05:00
BlueWall
ba7d8cedec
Add function osGetGridCustom
...
Add function osGetGridCustom to take an argument for the GridInfo kpv to retrieve from the GridInfoService
2012-01-17 22:38:36 -05:00
BlueWall
9ed9720861
Update osGetGrid**** functions
...
The osGetGrid**** functions will now get the grid settings from the GridInfoService. Set the GridInfoURI in your ./bin/config-include/GridCommon.ini [GridInfo] section.
2012-01-17 22:07:40 -05:00
BlueWall
939d60da59
Merge branch 'master' of /home/opensim/lib/osgrid/opensim
2012-01-17 21:10:31 -05:00
BlueWall
ef5575be1b
Add json handler for GridInfo
2012-01-17 21:09:46 -05:00
Melanie
08b6b3bb48
Add some logging
2012-01-17 17:36:26 +01:00
Melanie
5afb70b9fe
Fix prim calculations so that > 32767 prims are supported
2012-01-17 15:30:52 +01:00
Melanie
747c25e920
Spin off NPC deletion into a thread to avoid it being done on a script
...
microthread. A stab at fixing exceptions.
2012-01-17 11:18:56 +01:00
Melanie
e13a17cc0c
Allow retrival of multiple user records in one operation, analog to presence
2012-01-16 23:09:24 +00:00
Melanie
b14a6acd2f
Merge branch 'master' into careminster
2012-01-16 23:08:47 +00:00
Justin Clark-Casey (justincc)
59a0c50d48
Comment out noisy log lines I accidentally included in the nant build target adjustment commit.
...
Left in the method doc.
2012-01-16 23:04:08 +00:00
Justin Clark-Casey (justincc)
82ad9d4e04
Remove monocov and other obsolete nant build targets.
...
monocov was a code coverage attempt 3 years ago which no longer works.
other removed targets have been commented out or unused for a very long time
2012-01-16 22:58:58 +00:00
Melanie
d6b9504c84
Add methods to allow the groups modules to query online status and last login
2012-01-16 02:19:19 +01:00
Melanie
35911d2362
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2012-01-15 14:51:00 +01:00
Melanie
9447b6d15f
Merge branch 'master' into careminster
2012-01-15 14:40:33 +00:00
Melanie
068b8e1f9b
Disable using an agent ID to clone NPCs. The griefing potential is too great
2012-01-15 14:49:32 +01:00
Mic Bowman
2e4fbe6b17
protect the region ready alerts for loading oarfiles if no post URI is set
2012-01-14 23:43:21 -08:00
nebadon
43173f1b0d
commented out redundant land owner checks for osTeleportAgent there is
...
no need for these checks just use Allow_osTeleportAgent = PARCEL_OWNER
also increased function to severe threat level to make it harder to
accidently enable it for everyone.
2012-01-14 18:36:46 -07:00
Melanie
ec299bfa87
Allow SmtpClients and other SSL users to work with our cert handler installed
2012-01-14 06:03:27 +00:00
Melanie
4cbf8d728e
Fix merge
2012-01-14 05:39:56 +01:00
Melanie
43128c9016
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-01-14 06:09:19 +00:00
Melanie
72247bdaef
Allow SmtpClients and other SSL users to work with our cert handler installed
2012-01-14 05:28:57 +01:00
Justin Clark-Casey (justincc)
82f0e19349
Extend scripts show command to accept a single item UUID parameter to display one script's status
...
Usage is now scripts show [<script-item-uuid>]
2012-01-14 00:44:19 +00:00
Justin Clark-Casey (justincc)
b5bb559cc0
Register the UrlModule for script engine events OnScriptRemoved and OnObjectRemoved just once in the UrlModule itself, rather than repeatedly for every script.
...
Doing this in every script is unnecessary since the event trigger is parameterized by the item id.
All that would happen is 2000 scripts would trigger 1999 unnecessary calls, and a large number of initialized scripts may eventually trigger a StackOverflowException.
Registration moved to UrlModule so that the handler is registered for all script engine implementations.
This required moving the OnScriptRemoved and OnObjectRemoved events (only used by UrlModule in core) from IScriptEngine to IScriptModule to avoid circular references.
2012-01-14 00:23:11 +00:00
Mic Bowman
a30a02e7ae
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-13 14:51:11 -08:00
Mic Bowman
e1a2c44ebe
Cleaned up the LookAt code in SOP and SOG. Added support for incrementally
...
rotating physical objects. This does not use physics. Currently the rate
of change is determined as 1 / (PI * Strength).
2012-01-13 14:48:56 -08:00
BlueWall
cde80125ad
Merge branch 'master' of /home/opensim/src/opensim
2012-01-13 17:16:20 -05:00
Bo Iwu
02d6b033d0
Fix improper code formatting introduced in 6214e6a217
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-01-13 17:10:48 -05:00
Mic Bowman
adea92f8b7
Fix llRotLookAt and llLookAt for non-physical objects. Per conversation
...
with Melanie and Nebadon, SL behavior seems to be that non physical
objects snap to the request rotation.
2012-01-13 11:37:17 -08:00
BlueWall
57ba9ef5ad
Update RegionReadyModule
...
Fix triggering of alerts when rezzing first script to an empty region, add login disable when loading oars.
2012-01-13 11:35:44 -05:00
Melanie
982f3d58a9
Merge branch 'master' into careminster
2012-01-13 04:04:39 +00:00
Melanie
9dc7fef4f6
Merge branch 'master' into careminster
2012-01-13 02:27:20 +00:00
BlueWall
c5594e839e
Undo some prior work
...
Move some added fuctions out of core into the addon module to keep things clean
2012-01-12 21:19:31 -05:00
BlueWall
acbff305f5
Merge branch 'master' of /home/opensim/var/repo/opensim
2012-01-12 21:06:27 -05:00
BlueWall
d40ec1c346
Move some interfaces to a more apropriate place
2012-01-12 20:49:50 -05:00
Justin Clark-Casey (justincc)
3b59af2225
Change the default osNpcCreate() to create an 'owned' npc rather than an 'unowned' one.
...
An owned NPC is one that only the original creator can manipulate and delete.
An unowned NPC is one that anybody with access to the osNpc* methods and knowledge of the avatar id can manipulate.
This is to correct an oversight I made in the original reimplementation where I mistakenly assumed that avatar IDs could be treated as private.
I am not anticipating that many people were deliberately making use of unowned npcs due to their insecure nature.
If you do need an unowned NPC please call the new overloaded osCreateNpc() function with the option OS_NPC_NOT_OWNED.
2012-01-13 00:03:39 +00:00
Justin Clark-Casey (justincc)
6e7154d55c
Removing osNpcCreateOwned(). Please use osNpcCreate(string user, string name, vector position, string notecard, int options) instead with option OS_NPC_CREATOR_OWNED
...
Please note that correct option name is OS_NPC_CREATOR_OWNED not OS_NPC_CREATE_OWNED as mistakenly put in a previous commit.
2012-01-13 00:00:18 +00:00
Justin Clark-Casey (justincc)
47377f17c6
Add missing assert to confirm owner delete succeeded to the end of TestOsNpcRemoveOwned()
2012-01-12 23:46:43 +00:00
Justin Clark-Casey (justincc)
beab155434
Add api level test for removing an owned npc
2012-01-12 22:35:11 +00:00
Melanie
c7757d1038
Fix typo
2012-01-12 23:07:38 +01:00
Melanie
aa2cde2493
Disable unowned NPCs
2012-01-12 23:04:38 +01:00
Melanie
cf166d3f1e
Merge branch 'master' into careminster
2012-01-12 23:22:55 +00:00
Justin Clark-Casey (justincc)
caa207f59f
Add ossl level test for removing an unowned npc
2012-01-12 21:03:54 +00:00
Justin Clark-Casey (justincc)
1ac5aa6808
Add remove test for unowned avatars
2012-01-12 20:47:19 +00:00
Justin Clark-Casey (justincc)
c4972e7734
Add osNpcCreate(string firstname, string lastname, LSL_Vector position, string notecard, int options) variant.
...
This will be documented soon. Options can currently be
OS_NPC_CREATE_OWNED - creates a 'creator owned' avatar that will only respond to osNpc* functions made by scripts owned by the npc creator
OS_NPC_NOT_OWNED - creates an avatar which will respond to any osNpc* functions that a caller has permission to make (through the usual OSSL permission mechanisms).
options is being added to provide better scope for future extensibility without having to add more functions
The original non-options osNpcCreate() function will continue to exist.
2012-01-12 19:37:30 +00:00
Justin Clark-Casey (justincc)
d27dd3714f
Allow all NPCs to show up on sensors as all osNpc* script methods now check for ownership permission before executing.
...
As per #opensim-dev irc discussion.
2012-01-12 19:19:34 +00:00
Justin Clark-Casey (justincc)
ba3491c76e
Add permissions checks for owned avatars to all other osNpc* functions.
...
This is being done outside the npc module since the check is meaningless for region module callers, who can fake any id that they like.
2012-01-12 19:06:46 +00:00
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
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
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
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
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
Melanie
38ae479249
Make sure to prefix NPC names with "NPC:" so they can't be mistaken for users
2012-01-07 02:49:52 +01:00
Justin Clark-Casey (justincc)
f4231f0628
minor: remove mono compiler warning
2012-01-07 00:32:32 +00:00
Justin Clark-Casey (justincc)
ba163ab05b
Add method doc to SPA.Falling and use automatic private get property
2012-01-07 00:29:55 +00:00
Justin Clark-Casey (justincc)
c5c079f6aa
Fix bug where tapping home to stop falling would stop any avatar movement other than falling again.
...
Addresses http://opensimulator.org/mantis/view.php?id=5839
2012-01-07 00:17:40 +00:00
Melanie
679d155a39
Fix some syntax issues
2012-01-06 23:08:18 +00:00
Melanie
9668992493
Add osNpcPlayAnimation and osNpcStopAnimation which respect ownership as well
2012-01-06 22:59:50 +00:00
Melanie
1cffd8fa03
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-01-06 22:36:35 +00:00
Melanie
7518b075b7
Add osNpcCreateOwned to create an owned NPC. Those can be sensed only by the owner, can be destroyed only by the owner and only the owner can save their appearance. Added "NPC" as a flag to llSensor to sense NPCs and exclude them from "AGENT" results.
2012-01-06 22:35:06 +00:00
Justin Clark-Casey (justincc)
3073370d0e
Allow RemoteAdmin to deal with all the different kinds of region id parameter that have been used in different methods.
...
See http://opensimulator.org/mantis/view.php?id=5814
Thanks Michelle Argus!
2012-01-06 22:29:27 +00:00
Melanie
70157a4ec5
Fix some syntax issues
2012-01-06 22:33:51 +01:00
Melanie
a47aa46962
Add osNpcPlayAnimation and osNpcStopAnimation which respect ownership as well
2012-01-06 22:59:08 +00:00
Melanie
a34278cfc3
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
2012-01-06 22:41:26 +00:00
John Cochran
ff5a83d192
Fixed llAngleBetween() to allow denormal rotations
2012-01-06 21:14:42 +00:00
Justin Clark-Casey (justincc)
8c445dac67
Add script instruction count back to llRot2Euler. Other minor formatting/doc changes.
2012-01-06 21:12:22 +00:00
John Cochran
eb9bf71726
Replaced llRot2Euler function.
...
The original function suffered from unexpected results due to rounding
errors. An error of only 1 or 2 ulps would cause the code to not detect
a singularity at Y rotation +/- PI/2 and take the non-singularity code
path. The replacement code does not suffer from wildly inaccurate
results at the +/- PI/2 singularity. The check in the code for the
singularity isn't strictly needed, but gives more consistent results
At the singularity, the X and Z rotations add. The if check simply
forces the X rotation to be zero so the entirety of the X+Z rotation is
carried by Z.
Additionally, the test code has been updated to include test cases that
caused the old code to fail. The test algorithm is also updated to
perform a more meaningful test. The original code checked if the values
against expected values. This could fail at +/- PI rotations since a
rotation around an axis by PI causes the identical effect as a rotation
by -PI. The new test code checks that the returned angles can be used
to recreate a quaternion that causes the same rotation.
2012-01-06 21:08:54 +00:00
Justin Clark-Casey (justincc)
7661a0b2a9
Implement the FetchInventory2 capability. This accompanies the existing FetchInventoryDescendents2 capability.
...
Not yet enabled by default. You can enable this by setting Cap_FetchInventory2 = "localhost" in the [ClientStack.LindenCaps] section of OpenSim.ini
Enabling both FetchInventory2 and FetchInventoryDescendents2 improves the situation with properly fetching attachments and hud objects
Probably because viewers are never expecting the odd situation where FetchInventoryDescendents2 is present but not FetchInventory2
However, for some reason attachments and hud objects occasionally fail to appear, though their status is correct in inventory
For attachments, focussing on the avatar makes them appear. Hud objects have to be reattached.
2012-01-06 21:07:34 +00:00
Melanie
de9d6096a5
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2012-01-06 21:37:01 +01:00
Melanie
11c48ac807
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
2012-01-06 21:41:36 +00:00
John Cochran
e9b9eb6a4c
Replaced llRot2Euler function.
...
The original function suffered from unexpected results due to rounding
errors. An error of only 1 or 2 ulps would cause the code to not detect
a singularity at Y rotation +/- PI/2 and take the non-singularity code
path. The replacement code does not suffer from wildly inaccurate
results at the +/- PI/2 singularity. The check in the code for the
singularity isn't strictly needed, but gives more consistent results
At the singularity, the X and Z rotations add. The if check simply
forces the X rotation to be zero so the entirety of the X+Z rotation is
carried by Z.
Additionally, the test code has been updated to include test cases that
caused the old code to fail. The test algorithm is also updated to
perform a more meaningful test. The original code checked if the values
against expected values. This could fail at +/- PI rotations since a
rotation around an axis by PI causes the identical effect as a rotation
by -PI. The new test code checks that the returned angles can be used
to recreate a quaternion that causes the same rotation.
2012-01-06 21:30:51 +00:00
Melanie
f1846045a6
Add osNpcCreateOwned to create an owned NPC. Those can be sensed only by the owner, can be destroyed only by the owner and only the owner can save their appearance. Added "NPC" as a flag to llSensor to sense NPCs and exclude them from "AGENT" results.
2012-01-06 21:34:43 +01:00
Melanie
f8c15d38a6
If dragging a script that is no copy from prim inventory into agent
...
inventory, stop it first in scene. If deleting from prims, move to trash
rather then making it poof.
2012-01-06 17:43:35 +00:00
Melanie
3003133a66
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-01-06 17:39:39 +00:00
Melanie
81cf774fe8
Merge branch 'master' into careminster
2012-01-06 17:38:53 +00:00
Melanie
fbb2a7e90d
Add ThreatLevel.NoAccess to OSSL. This allows to enable OSSL without enabling
...
any methods, even those without threat, automatically. It is for use with
setups wanting to allow only specific methods to specific users.
2012-01-06 17:37:22 +00:00
Melanie
31dc5aa728
If dragging a script that is no copy from prim inventory into agent
...
inventory, stop it first in scene. If deleting from prims, move to trash
rather then making it poof.
2012-01-06 13:15:04 +01:00
Melanie
db482cb7dd
Fix up asset stuff
2012-01-06 00:04:32 +01:00
BlueWall
b06d878790
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-05 17:55:24 -05:00
Melanie
23ce1dfc27
Remove a dangling command registration
2012-01-05 23:54:51 +01:00
Melanie
fdfc4ab2a8
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
2012-01-06 00:08:18 +00:00
BlueWall
f252161941
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-05 17:54:51 -05:00
Justin Clark-Casey (justincc)
b86e7715a8
Improve "j2k decode" command to tell us how many layers and components were decoded, instead of just success/failure
2012-01-05 22:54:33 +00:00
BlueWall
e393b47da8
Merge branch 'new_modules'
2012-01-05 17:54:05 -05:00
BlueWall
2b4edd659f
Adding empty ISearchModule interface
2012-01-05 17:53:03 -05:00
Justin Clark-Casey (justincc)
5ea9740f1b
Add a "j2k decode" region console command that allows a manual request for a JPEG2000 decode of an asset
...
For debugging purposes.
2012-01-05 22:40:49 +00:00
Justin Clark-Casey (justincc)
da0fc3c8f5
Make "show asset" command available simulator side. Actually make the service command be "show asset" instead of "show digest" this time.
...
Last time I accidnetally just changed the usage message.
2012-01-05 21:11:32 +00:00
Justin Clark-Casey (justincc)
f06acc0a85
Add size and temporary information to "show asset" command
2012-01-05 21:05:10 +00:00
Justin Clark-Casey (justincc)
5b160f5b7b
Rename 'show digest' console command to 'show asset'
2012-01-05 20:56:29 +00:00
Justin Clark-Casey (justincc)
7319ba62dd
Move simulator asset info commands to an optional module from the connector. Make them conform with service side commands.
...
This stops them appearing twice when Hypergrid is enabled.
2012-01-05 20:51:49 +00:00
Justin Clark-Casey (justincc)
f2ff6d5186
Move asset commands from AssetService to AssetServerConnector so that we can harmonise the same commands on the simulator side.
...
No functional change.
2012-01-05 20:33:44 +00:00
Justin Clark-Casey (justincc)
50e459d265
recomment log messages I accidentally left uncommented
2012-01-05 19:44:06 +00:00
Justin Clark-Casey (justincc)
c201b54b85
Improve "app rebake" command to return a better message if no uploaded texture ids were available for the rebake request
2012-01-05 19:40:54 +00:00
Justin Clark-Casey (justincc)
da6c816204
Commenting out DataSnapShot message "Registering service discovery capability" for now.
...
Please uncomment if/when needed.
2012-01-05 17:10:38 +00:00
Melanie
2c401b7359
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-01-05 08:12:34 +00:00
Melanie
97ba3c9346
Small fix to GetWorldPosition to get closer to Avination sit behavior
2012-01-05 08:11:52 +00:00
Melanie
e9296721c7
That needs to be callable from elsewhere!
2012-01-05 08:04:04 +01:00
Melanie
85d82c8140
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2012-01-05 07:43:16 +01:00
Melanie
1ebc9d04aa
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2012-01-05 08:15:33 +00:00
Melanie
045f3b8b11
Clean up GetWorldPosition
2012-01-05 07:37:31 +01:00
Melanie
32b8fa4a77
Prevent spurious "CHANGED_POSITION" during region backup
2012-01-05 07:37:09 +01:00
Justin Clark-Casey (justincc)
8fb70a2058
Add "appearance rebake" command to ask a specific viewer to rebake textures from the server end.
...
This is not as useful as it sounds, since you can only request rebakes for texture IDs already received.
In other words, if the viewer has never sent the server this information (which happens quite often) then it will have no effect.
Nonetheless, this is useful for diagnostic/debugging purposes.
2012-01-04 22:45:07 +00:00
Justin Clark-Casey (justincc)
0634c38505
Separate out rebake request code from cache validation code AvatarFactoryModule.
...
This allows some logic simplification and allows an external caller to manually request rebakes even if textures are uploaded (future command).
2012-01-04 22:22:46 +00:00
Justin Clark-Casey (justincc)
7e6c84c334
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-04 21:41:28 +00:00
Justin Clark-Casey (justincc)
3a64522267
Minor formatting changes and commented out log lines for future debugging of image manager (udp texture fetch). No significant functional changes.
2012-01-04 21:40:15 +00:00
Dan Lake
3a2ac0e2ee
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-04 12:01:32 -08:00
Dan Lake
fc391d4b10
Added EventManager.OnRegionStarted which is triggered when Heartbeat is started.
2012-01-04 12:01:18 -08:00
Justin Clark-Casey (justincc)
aa625da6a6
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-04 19:53:48 +00:00
Justin Clark-Casey (justincc)
82df5de5cf
Remove the pointless LLClientView.m_imageManager null check.
...
Despite the code comments we never actually null it.
2012-01-04 16:15:05 +00:00
Dan Lake
ecf9824b63
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-03 16:52:53 -08:00
Dan Lake
0ab2289cdc
Access to these static methods to serialize objects are useful outside of serializer
2012-01-03 16:52:08 -08:00
Justin Clark-Casey (justincc)
983b49c0c8
commented out "Prevented flyoff" log message for now as this becomes problematic with bot testing.
...
Please uncomment if still needed.
2012-01-03 18:25:31 +00:00
Justin Clark-Casey (justincc)
01eacd3a31
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-03 18:22:14 +00:00
BlueWall
e78a3913e0
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-03 12:22:13 -05:00
BlueWall
2c8e72217e
Merge branch 'new_modules'
2012-01-03 12:20:49 -05:00
BlueWall
6941058824
Profile Updates
...
Update basic profile to use the replaceable interface, making configuration less error-prone. Add support to query avatar's home user account and profile service for regions usng the updated OpenProfileModule with Hypergrid.
2012-01-03 11:10:23 -05:00
Justin Clark-Casey (justincc)
fa79588a20
minor: add missing newlines to pCampbot usage statement
2012-01-03 15:42:36 +00:00
Melanie
a6e305063e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
OpenSim/Services/Interfaces/IUserAccountService.cs
2012-01-02 21:41:36 +00:00
Justin Clark-Casey (justincc)
fac8c25851
Reduce accessibility of some J2KImage/LLImageManager properties and methods to reduce potential code complexity and make code reading easier.
2012-01-02 21:31:42 +00:00
Justin Clark-Casey (justincc)
014a86c26b
Adding commented out log messages and some minor formatting for future bug hunting. No functional changes.
2012-01-02 19:46:30 +00:00
BlueWall
87374274b9
Fix for failed http request status
...
Thanks "sendapatch" for fixes to llHTTPRequest status reporting.
2012-01-01 23:44:46 -05:00
Diva Canto
56dbcae402
Bug fix in map tiles in standalone: the map has been blank since commit 01ae916bad
r/17324 (Nov.18, justincc). But the root cause comes from commit 02e54c57c4
Author: Oren Hurvitz Date: 7/22/2011
...
This is a nasty situation. The map tile UUID is, in principle, stored authoritatively in RegionSettings. However, it also needs to be stored in the Grid Service because that's how other sims can retrieve it to send it in Map Blocks to non-V3 viewers. So every time the tile image changes, that change needs to propagate to the Grid Service, and this is done via RegisterRegion (ugh!). Interestingly, this problem didn't affect grids because by default AllowRemoteDelete is false, so the prior images aren't being deleted from the asset servers -- but they were not being correctly updated in the map either, the map was stuck with old images.
2011-12-30 21:32:28 -08:00
Diva Canto
5d8ed077bc
Bring back the Hyperlinker to the Robust console. Moved the config to [GridService]. Changed all HG-related .inis, including HyperSimianGrid. No changes in user-facing inis.
2011-12-30 19:17:35 -08:00
Diva Canto
5aad1f7afe
Default LocalToGrid to true. Fixes minor bug introduced yesterday where old robust UserAccount service would result is LocalToGrid at the sim being false.
2011-12-30 10:40:57 -08:00
Mic Bowman
967ea51980
Set the local grid flag in the user account through the simian connector
...
This should make bi-directional hypergrid work.
2011-12-29 16:37:16 -08:00
Diva Canto
571efeddb2
Added UserManagementModule.IsLocalGridUser(UUID) to be used throughout region Scenes and Modules. Changed existing modules to use it instead of assuming that foreign = null account.
2011-12-29 16:12:06 -08:00
Diva Canto
42f5394677
Added field LocalToGrid in UserAccount. Context: make HG work in Simian.
2011-12-29 15:39:12 -08:00
Diva Canto
98ab3dffa3
Deleted two obsolete files in Inventory modules.
2011-12-29 15:33:04 -08:00
Diva Canto
ef4d989f37
Deleted unused methods from HGAssetBroker
2011-12-29 15:21:56 -08:00
Diva Canto
6974596e83
Fixed mix-up in UserAccount fields when passing UserAccounts remotely.
2011-12-29 12:34:57 -08:00
Diva Canto
b756077269
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-12-29 12:18:22 -08:00
Diva Canto
70e36ee2b4
HG: more adjustments for making HG Simian work. Added server_uri as new key on get_agent_home in UAS.
2011-12-29 12:17:58 -08:00
Melanie
bde004c08e
Merge branch 'master' into careminster
2011-12-28 09:24:35 +00:00
Melanie
5b52440e61
Introduce a LightShare kill packet ans send it when needed. Currently only
...
understood by AVN v0.3
2011-12-28 09:24:02 +00:00
Melanie
bf4d727cd5
Fix permissions being lost and correct slam behavior, removing icompatible
...
code inherited from core and dead code.
2011-12-27 14:04:49 +01:00
Melanie
ad1c6442cd
Remove a debug spam
2011-12-27 01:40:44 +01:00
Diva Canto
b6cfe15c7c
HG: more / love for Xmas
2011-12-24 07:44:26 -08:00
Melanie
41f6d6a5ff
Introduce a LightShare kill packet ans send it when needed. Currently only
...
understood by AVN v0.3
2011-12-24 16:18:01 +01:00
Melanie
2e07d24199
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2011-12-24 01:46:04 +01:00
Melanie
c4e16b26bb
Merge branch 'master' into careminster
2011-12-24 02:21:35 +00:00
Melanie
c9dbcfbb31
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2011-12-24 01:43:44 +01:00
Melanie
f2855d3668
Add setter for Acceleration on physics objects.
2011-12-24 01:41:32 +01:00
Melanie
5b28e29530
Fix camera orientation for sit targets to use the prim actually sat on.
...
Now SL compatible.
2011-12-24 01:40:58 +01:00
Melanie
04806e02ed
Add PRIM_POS_LOCAL as an alias to PRIM_POSITION for setting the position.
...
For SL compatibility only
2011-12-24 01:40:09 +01:00
Diva Canto
f9a1fd5748
HG: one more adjustment with trailing /s
2011-12-23 15:08:13 -08:00
Diva Canto
d38b8caf2b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-12-23 10:58:55 -08:00
Diva Canto
26bb95fe3d
HG: AAdded a few missing /'s at the end of URLs
2011-12-23 10:58:30 -08:00
Mic Bowman
c6ce464dbc
remove the old region crossing handler
2011-12-23 10:13:32 -08:00
Melanie
b8a914b15b
Merge branch 'master' into careminster
2011-12-23 01:00:34 +00:00
Mic Bowman
456c89a7a3
Fixes some problems with objects that attempt to cross a region boundary
...
into a region that does not exist. This is particularly problematic for
physical objects where the velocity continues to move them out of the
region causing an infinite number of failed region crossings. The patch
forces an object that fails a crossing to be non-physical and moves it
back into the starting region.
2011-12-22 16:59:51 -08:00
Mic Bowman
f394cb2e8f
fix the UsesPhysics flag to reference the physics flag rather than the temponrez flag
2011-12-22 16:21:32 -08:00
Mic Bowman
6b08c051a3
Enables processing of hypergrid links through simiangrid services. Thanks
...
otakup0pe
2011-12-22 15:31:51 -08:00
Justin Clark-Casey (justincc)
790ca65c84
Align default ODE_STEPSIZE with that already used through OpenSimDefaults.ini
2011-12-22 20:22:15 +00:00
Justin Clark-Casey (justincc)
7ccd8f8f1d
rename Scene.m_physicalPrim to PhysicalPrims since its public and access external as a property
2011-12-22 19:57:50 +00:00
Melanie
eef6f92029
Merge branch 'master' into careminster
2011-12-22 19:52:59 +00:00
Justin Clark-Casey (justincc)
f7dbdba447
Remove unused m_physicalPrim parameter from SOG.ApplyPhysics()
2011-12-22 19:52:09 +00:00
Justin Clark-Casey (justincc)
48113f0fc8
Make it possible to force all prims to be phantom via the collidable_prim boolean setting in the OpenSim.ini config [Startup] section.
...
Naturally, default is true.
When set to false, "phantom" flags on prims can be set as usual but all prims remain phantom.
This setting is for test purposes.
This switch does not affect the collision of avatars with the terrain.
2011-12-22 19:44:52 +00:00
Melanie
a15a58a7c1
Merge branch 'master' into careminster
2011-12-22 17:33:31 +00:00
Diva Canto
469955889e
Region crossings redone: (1) removed WaitForCallback. Now that we are passing the entire agent with attachs in one big message we don't necessarily need to wait for confirmation. The callback sometimes is problematic and it adds delay to the process. (2) Z velocity sent to the viewer = 0. This is an heuristic; the Z velocity usually is negative, and it makes the viewer move the avie down. This only matters while the agent is in transit and therefore not being physically simulated by neither region. As soon as the receiving region receives CompleteMovement from the viewer, the position and velocity get corrected.
2011-12-22 09:30:06 -08:00
Melanie
b72dd852b7
Merge branch 'master' into careminster
2011-12-22 16:58:38 +00:00
Melanie
7f527814d5
And a typo fix
2011-12-22 16:57:49 +00:00
Melanie
66a0471efa
Merge branch 'master' into careminster
2011-12-22 16:52:14 +00:00
Melanie
6412349dec
Add a few comments, correct a merge artefact
2011-12-22 16:51:51 +00:00
Melanie
2347593dac
Harmonizing SP with Avination
2011-12-22 16:48:52 +00:00
Melanie
b970d4f976
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-12-22 16:37:25 +00:00
Diva Canto
219ec7ef20
Fixing a bug introduced yesterday. This put the precondition test inside CheckForBorderCrossing the right way.
2011-12-22 08:18:03 -08:00
Diva Canto
bb0c6a498b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-12-21 15:17:44 -08:00
Diva Canto
ddff2f246c
Moved an external test into the method that uses those preconditions.
2011-12-21 15:17:26 -08:00
Diva Canto
651f9f47d0
HG: Verify that the user is local
2011-12-21 14:56:38 -08:00
Dan Lake
41b02a7208
Remove unused SetAcceleration and add set on Acceleration parameter
2011-12-20 14:45:32 -08:00
Melanie
ca6113a4d5
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
2011-12-20 21:51:43 +00:00
Justin Clark-Casey (justincc)
fa0a71253f
Though the viewer warns about receiving this, not sending appears to break baked texture caching when crossing region boundaries.
...
Needs further investigation.
Revert "Stop sending the viewer its own AvatarAppearance packet."
This reverts commit 92039f295d
.
2011-12-20 18:54:15 +00:00
Diva Canto
dd69c9fd20
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-12-20 09:53:05 -08:00
Diva Canto
25cbba9bca
Fixed bug of avie going under the terrain when crossing regions in certain directions. This was a 1-off bug: the terrain was being placed in 127, 127 resulting in a bounding box if -2, 256. I placed it in 128, 128 resulting in a bounding box of -1, 257.
2011-12-20 09:43:39 -08:00
Melanie
2b4ebe657c
Merge branch 'master' into careminster
2011-12-19 23:16:20 +00:00
Justin Clark-Casey (justincc)
87a2d8d51b
Move HandleObjectGroupUpdate() from GroupsModule to Scene.PacketHandlers.cs as this is updating SOG/SOP.GroupID, which is arguably generic.
2011-12-19 23:03:45 +00:00
Melanie
efa4284391
Merge branch 'master' into careminster
2011-12-19 21:30:57 +00:00
Justin Clark-Casey (justincc)
92039f295d
Stop sending the viewer its own AvatarAppearance packet.
...
The viewer warns in the log if it receives this.
Stopping this doesn't appear to have adverse effects on viewer 1 or viewer 3 - the viewer gets its own appearance from body parts/clothes and self-baked textures.
2011-12-19 20:13:48 +00:00
Justin Clark-Casey (justincc)
2899de1a5c
Stop unnecessarily sending the TextureEntry in client avatar updates.
...
As far as I know, viewers don't use this mechanism to recieve new TextureEntry data for avatars. This is done via the AvatarAppearance packet instead.
Tested this back to viewer 1.23.
Replacing with Utils.EmptyBytes since converting the texture entry to bytes on each AvatarUpdate (or which there are many) is not cost-free.
2011-12-19 19:19:05 +00:00
Justin Clark-Casey (justincc)
e8fbeeba5f
Fix race condition where the appearance update timer could be stopped just after another thread had started it on QueueAppearanceSave() or *Send()
...
However, the window for this race is very small, and the next queued appearance save or send would restart the timer anyway.
2011-12-19 19:08:24 +00:00
Justin Clark-Casey (justincc)
fc9400db07
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-12-19 19:07:35 +00:00
Justin Clark-Casey (justincc)
0b91ec8dd2
Migrate detailed "appearance show" report generation up to AvatarFactoryModule from AppearanceInfoModule so that it can be used in debug (inactive).
...
Further filters "debug packet <level>" to exclused [Request]ObjectPropertiesFamily if level is below 25.
Adjust some method doc
Minor changes to some logging messages.
2011-12-19 18:58:05 +00:00
nebadon
6baee2e10b
addresses mantis #5827
...
RAdmin - admin_save_oar fails if noassets parameter missing
thanks Michelle Argus
2011-12-19 11:51:03 -07:00
Melanie
759f1d2dbe
Merge branch 'master' into careminster
2011-12-18 10:49:45 +00:00
Melanie
c4f1906b0a
Make raycast more efficient by checking exclusion flags earlier
2011-12-17 12:57:20 +01:00
Melanie
8a9a8ed5c9
Fix hit testing link sets properly. Fix raycasting for LSL.
2011-12-17 12:31:25 +01:00
Justin Clark-Casey (justincc)
4d065f0453
Provide user feedback on execution of "backup" region console command
2011-12-17 02:42:43 +00:00
Justin Clark-Casey (justincc)
684482352c
Fix bug where objects couldn't be set back to the "none" group.
...
This is handled by treating UUID.Zero as a special case.
Currently, asking for the "none" group returns nothing because XMLRPC groups, at least, is not properly handling this case.
It may be better in the future to have GroupsModule return an appropriate GroupsData structure instead or require the underlying services to behave appropriately.
This is a further component of http://opensimulator.org/mantis/view.php?id=5588
2011-12-17 02:35:08 +00:00
Justin Clark-Casey (justincc)
f9137c923b
Fix bug where objects could not be set to a new group if the group had been created in that client session, or if no other action has been performed on the object.
...
There were two problems here:
1) On object group update, we looked for the group is the IClientAPI group cache rather than in the groups service. This fails to groups created newly in that session
2) On object group update, we weren't setting the HasGroupChanged flag. This meant that the change was not persisted unless some other action set this flag.
This commit fixes these issues and hopefully addresses http://opensimulator.org/mantis/view.php?id=5588
This commit also moves HandleObjectGroupUpdate() to the GroupsModule from the Scene.PacketHandlers.cs file
2011-12-17 02:23:24 +00:00
Diva Canto
964ec57ffe
Changed the async approach on close child agents. This may improve crossings a little bit.
2011-12-16 17:24:50 -08:00
Diva Canto
99623894c7
Commented a couple of verbose debug messages.
2011-12-16 17:23:30 -08:00
Justin Clark-Casey (justincc)
7f019cc196
If a startup simulator script is present, run it after the normal region selection code rather than before.
...
This allows the script to change the selected region without having it immediately undone.
Thanks to Garmin Kawaguichi for this patch.
2011-12-17 00:27:19 +00:00
Justin Clark-Casey (justincc)
1bf05fbb1f
refactor: simplify methods in Scene.PacketHandlers.cs by using GetGroupByPrim() rather than retrieving GetEntities() and inspecting the entire list
2011-12-17 00:11:17 +00:00
Justin Clark-Casey (justincc)
a3a17e929e
Stop generating client flags when we send out full object updates.
...
These were entirely unused.
2011-12-16 23:20:12 +00:00
Justin Clark-Casey (justincc)
5c4056660f
Don't pass on ChaneWaterHeight event from EventManager is new water height is less than 0
...
This is to stop bad values and subsequent viewer crashes.
Thanks to Michelle Argus for this patch.
2011-12-16 21:16:01 +00:00
Justin Clark-Casey (justincc)
5d79f857b0
Comment out accidentally left in "Adding physics prim" log message
2011-12-16 20:54:28 +00:00
Justin Clark-Casey (justincc)
a9b39d6e5d
Tunnel [GroupsModule] DebugEnabled setting down into XmlRpcGroupsServicesConnectorModule so that we can record cache misses
2011-12-16 20:53:50 +00:00
Diva Canto
8300bb651e
Sends the consistent child agent position upon creation of the child agent in other regions, as opposed to <128, 128, 70>
2011-12-16 09:33:22 -08:00
Diva Canto
3bf699ad36
No functional changes. Changed the prefix of that log message [CONNECTION BEGIN] to [SCENE] because that's where the message happens.
...
Also changed the instantiation of a vector object to be done only once instead of every time we receive a position update.
2011-12-16 08:59:33 -08:00
Diva Canto
7e4a2d69d5
HG minor bug fix and marked one method obsolete in UAS.
2011-12-16 08:48:29 -08:00
Justin Clark-Casey (justincc)
8013c0d2f5
Stop pointlessly setting the m_colliderarr[] to false in the ODECharacter constructor
2011-12-15 22:33:14 +00:00
Justin Clark-Casey (justincc)
c0ba99e5ad
Stop having to call SetHeight again in ScenePresence.AddToPhysicalScene() when we've already passed size information to the avatar at PhysicsScene.AddAvatar()
...
Eliminate some copypasta for height setting in OdeCharacter
2011-12-15 22:29:36 +00:00
Justin Clark-Casey (justincc)
99570d8ebb
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-12-15 21:59:01 +00:00
Justin Clark-Casey (justincc)
937c06db54
Code cleanup related to ScenePresence.PhysicsActor and OdeScene/OdeCharacter
...
Stop hiding RemoveAvatar failure, add log messages when characters are removed through defects or re-added unexpectedly.
Add commented out log lines for future use.
Use automatic property for PhysicsActor for better code readability and simplicity
2011-12-15 21:57:22 +00:00
nebadon
58ba81ae4e
minor fix to MegaRegions, typo spotted by Ubit!
2011-12-15 10:49:15 -07:00
Justin Clark-Casey (justincc)
6f2d80cc93
minor: add some currently commented log lines for use in debugging
2011-12-14 21:27:47 +00:00
Melanie
69f29cb53e
Merge branch 'master' into careminster
2011-12-14 19:50:43 +00:00